[WIP] installer: use modern innosetup features#593
Draft
rimrul wants to merge 2 commits intogit-for-windows:mainfrom
Draft
[WIP] installer: use modern innosetup features#593rimrul wants to merge 2 commits intogit-for-windows:mainfrom
rimrul wants to merge 2 commits intogit-for-windows:mainfrom
Conversation
rimrul
commented
Feb 15, 2025
Member
Author
rimrul
left a comment
rimrul
left a comment
There was a problem hiding this comment.
This is entirely untested, I just made sure it builds.
installer/install.iss
Outdated
| end; | ||
|
|
||
| // Split NUL-delimited key/value pairs, extract LF that denotes end of key | ||
| StdOut:=StringJoin(#10,Output.StdOut); |
Member
Author
There was a problem hiding this comment.
We probably want to iterate over Output.StdOut directly instead of joining and re-splitting this, but that was the easiest Q&D way to at least get it to compile again.
Member
Author
There was a problem hiding this comment.
We do that now, but there's probably at least one off-by-one error in there.
rimrul
force-pushed
the
modern-inno-features
branch
from
d1ff608 to
0c4df92
Compare
Innosetup 6.4 introduced a New function ExecAndCaptureOutput that executes commands and captures there standard output and standard error streams. We've been using our own howmgrown solution called ExecWithCapture for this purpose, but it's a bit finicky. Switch to the official implementation. Signed-off-by: Matthias Aßhauer <mha1993@live.de>
rimrul
force-pushed
the
modern-inno-features
branch
from
0c4df92 to
8d18d60
Compare
Innosetup deprecated x64 in V6.4 in favour of x64os and x64compatible. Use the appropriate new replacements. Signed-off-by: Matthias Aßhauer <mha1993@live.de>
rimrul
changed the title
| SourceDir={#SOURCE_DIR} | ||
| #if BITNESS=='64' || INSTALLER_FILENAME_SUFFIX=='arm64' | ||
| ArchitecturesInstallIn64BitMode=x64 arm64 | ||
| ArchitecturesInstallIn64BitMode=x64compatible arm64 |
Contributor
There was a problem hiding this comment.
With the new x64compatible, there should be no need to explicitly set arm64 anymore:
x64compatible
Matches systems capable of running x64 binaries. This includes systems running x64 Windows, and also Arm64-based Windows 11 systems, which have the ability to run x64 binaries via emulation.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Innosetup 6.4 introduced a New function ExecAndCaptureOutput that executes commands and captures there standard output and standard error streams. We've been using our own howmgrown solution called ExecWithCapture for this purpose, but it's a bit finicky. Switch to the official implementation.